From d84b575cd0a4cb411489007687086149c5c670cd Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Tue, 21 Jul 2009 11:44:25 -0500 Subject: [PATCH] =?utf8?q?Bug=20589275=20=E2=80=93=20[csw]=20Trying=20to?= =?utf8?q?=20destroy=20NULL=20regions?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit gdk_window_input_shape_combine_mask() can accept NULL for the mask parameter, but it wasn't checking for NULL before passing the resulting GdkRegion to gdk_region_destroy(). Fixes #589275 --- gdk/gdkwindow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index ad8ac06de5..ab2c3966cf 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -7392,7 +7392,7 @@ gdk_window_merge_child_shapes (GdkWindow *window) /** * gdk_window_input_shape_combine_mask: * @window: a #GdkWindow - * @mask: shape mask + * @mask: shape mask, or %NULL * @x: X position of shape mask with respect to @window * @y: Y position of shape mask with respect to @window * @@ -7437,7 +7437,8 @@ gdk_window_input_shape_combine_mask (GdkWindow *window, region, x, y); - gdk_region_destroy (region); + if (region != NULL) + gdk_region_destroy (region); } /** -- 2.30.2